merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 20 May 2011 00:42:04 +0000 (09:42 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 20 May 2011 00:42:04 +0000 (09:42 +0900)

Trivial merge